Add aspectj dependency. Minor refactor.