Little bit of code cleanup
Updated files to 2.0.1