Cleaned up some names, and removed hardcoding from outside of data.js