Commit documentation for uniform code style and tidy up the code accordingly
Commit documentation for uniform code style and tidy up the code accordingly