Refactoring, formatting, inlining suggestions, etc