Better code, better naming schemes