Cleaning up
More checks