Some few changes to make it look a tiny bit better