Clean up comments
Use more robust conditional for checking user