Cleaned up some commented code