some cleanup
removing some unused code and changing formatting