Minor changes to follow coding standards