Attributes -> enum, stylecop tweaks