Cleaning up comments & removed JavaDoc comments for methods that
implement the public interface (which is customary I believe)