Trying some different settings out, tidying up