code clean-up

adding some new lines and spaces where they're needed