Removed leftovers from switch to simple int