Minor improvments and cleanup

Version  0.1.1