Code cleanup via Dynamic static class