Reformat to follow coding standards betterer