Refactor

Last refactoring before "release"