Cleaned code style and comments