Camera cleanup

Increase readability, keeping the same logics.