refactoring & optimization