Checkstyle: "whitespace" and "design"

Change-Id: Icccd8cfc3dd83a65e44c8a4a9f4f4198d6791982