Making everything a bit more readable