remove comments, clean code

still need to rename file