shortens some functions
Merge pull request #1 from mbildner/master

Thanks!