clean it up better..