Code reformat
Tests added
First version