Clean up code. Start using classes.