Refactored coding standarts