Feature/coderefactor