clean up the code/comments a bit