Improved code quality especially static accessors
More code cleanup