Minor updates, moved ternary to the bottom