Refactoring & remove powerline