Removed unnecessary IF's