Re-factor StyleGuide for ease of type addition