code cleanup, fixing documentations (Fixes #4)