417f21ed3d
* Code cleanup * Fix flux tests * Fix checkstyle errors * Fix compile error
* Code cleanup * Fix flux tests * Fix checkstyle errors * Fix compile error