Remove commented code, remove ternary