hackus: Refactoring