removed useless comments and cleaned up some code