CHECKSTYLE: removed redundant interface defs, fixed formatting and line length issues, imports, etc