Fixing it up a little..