clean up little bit, start writing DB