Stylin

This is actually refactoring, even though it's on the stylin branch.