refactoring & alin naming convention