7ddfb37 Style refactor