Code format changes for underscore, remove mixed case in methods