Making code a bit clearer