cleaned up & updated some comments