Removed redundancies for various checks, removed author comments