Reformat, optimize imports, remove testblock, added batterytank