Version 2.0.1 Cleaning up