Cleaned up code, remove camel case