updated naming conventions, updated normalize.R