Spec fix
Code cleanup
Updated readme