Code cleanup
Switch to ref count style loader
Style tweaks from design feedback