Dropped commented out code and tweaked names.