Added cleanup and formatter for eclipse