Now pass checkstyle and lint. Much faster UI.