Doing some clean up

Just old comments and style stuff