#41 #42 Clean up code