Introduce Naming Convention, Clean up code