Light code clean-up; formatting improvements