Code refactoring: Updated comments, removed obsolete braces and white spaces.