Trying to prettify it some more