mvp done, start cleaning