Code clean up / customs