Removed unneccassary parts and cleaned up whitespace.