Stylistic changes and metaprogramming refactoring