Continuation of CheckStyle fixes