Removed redundant checks
Minor improvements