Code cleaning
Fixed #84