V0.2.1 cleaned up project