Removed calibrate functionality, extra whitespace, other things