General code clean up / Aliases