changed tabs from 2 spaces to 4 spaces, and using under_scores instead of camelCase