Updated to follow coding standards

Code style fixes.