Clean steps & add loader