Deleted some bad ideas, some code style clean up