Small cleanup of formatting, some commenting