Clean up and nice comments and readme