Code cleanup for CheckStyle's sake