Removed some redundent specifiers, interfaces, and semicolons.

Change-Id: Ic62ca83809a186cf8e56d9cf5f1ad82e1bed6a41
Removed an unnecesary label on the break keyword.

Change-Id: I8657263ee408f03e7f69f7700d2af9316d42fa53