Cleaned up the code so comments were on the same line