Beautfied a bit