nit cleanup from find bugs and java 7 conventions