Fix comment, spacing, code analysis