Cleaned up and added installation