DDF-601: Added extra logging for STS operations.
Also fixed up various checkstyle issues.