Removed unnecessary conditionals