Clean up

killed some commented code out code from the old implementation cleaned
up the braces.