Refactored again, code standards