removed bloat, added efficienfy byu removing multiple if statements for one