Refactoring - formatting improvements.