Cleanup

Version 1.0.2