Refactorization, no maven