Trying to simplify and clean up