Fix more whitespace tab->space issues.
Simplify formula with atan2().