Cleaning up names, conventions