removing cruft comments
changing to decorator naming and add ~ to .gitignore