Cleanup and added static class members