Fixed name and minor cleanup.