Minor clean up to satify checkstyle rules.