Refactored coding standart