paranoid commit, just commented/cleaned up a little