Made it a bit less ugly