Code Refactoring: naming, comments
fixed coding style and some ocd