ECDR-1 cleaned up checkstyle errors