#196 Starting to clean up code