Progress on #9

Just some simplification of the code