refactoring done + ready to test