cleaned up comments, unused code etc