Code cleaning
Temporary reverted c7898f5 (#83)