Some clean up & updated install command