Additional code reformat and cleanup