clean code
Merge branch 'master-axel'