Minor fixes + code formatting.