Refactored, changed naming convention, and updated...