Clean-up and proper naming.