Comments and structure cleanup

Made comments more uniform