Java refactoring 101 [work in progress]