Elucidated variable names, cleaned up methods and cases