cleaned up to make installing simpler