Remove tab
Fix comment and contract
Address other PR comments
Add ; for error guidelines and avoid bad newlines