Further cleaning up to read nicely