fix formatting - save that precious vertical space
fix structure of code