General code clean up / Aliases
Merge pull request #62 from panpawn/patch-14

General code clean up / Aliases