Fixed formatter; clean-up.