cleanup
Changing step-by-step to frontend / backend