cleaned things up slightly