Fixed code formats and comments