TASK: finishing touches
--deleted some commented out code