Formatted actuator and xodetools code
Merging