Made a bit more 'plain'