Clean-up: renaming, commenting, updating data location