Fixed comments and indentation