Made note of some 'findbugs' warnings - unsure how to resolve atm