cleaned out comments and stuff