Source cleanup

Including:
 - Override annotations for Java 1.6 (interfaces implementations)
 - Missing javadoc tag
 - If-statement with single-line throw or return