implementation rewrite and simplification

Code simplified, more consistent and better organized. All tests reviewed and coverage further increased (to 95%).