got rid of camel case and cleaned up sorting syntax