Switch from static class to namespace, remove redundant includes