Fixing some checkstyle and TODO's