removed commented out stuff and cleaned up a bit