Code cleaning -- Ready for Simulator