add ability to delete comments and clean the code up a bit