Cleanup and simplify install
Version 0.3.3