Polish, comments, removed unneeded code, general clean up