Merge "Tweaked the logging + some minor style fixes."