cleaned up some stuff

removed Page1 related stuff, updated comments, reformatted code