Making things a bit more readable