Cleanup & Version Increase to 0.2.1