Install: cleaned up code