Cleaned up and added installation
Cleaned up