Made code a bit clearer