addressing issues in comment-style and indentation