Cleaned all for Checkstyle, added Overrides, and put in final data.