Removed unnessasary conditionals