cleaning up some commented code, spacing, trailing new lines