#34 code improvements p1

 #34 code improvements p2

 #34 code improvements p3