JavaDoc comments added, TODOs removed