Clean up the names to make code easier to follow

fix #6