Adding some fixes to follow coding style standards.