first working commit
Code clean up