Cleaned Switch atrocity with ternaries

Still same functionality, less code.