Clean up the names to make code easier to follow

issue: #6