Compress Functions, Comment out Test Cases, Better Comments