Fixed code style and comments