Resolves #8
code cleaning