Renaming/Commenting

Removed unnecessary comments and cleaned up some stuff