Clean up code, getting there