Clean code
Merge branch 'feature/clean_code' into develop