Made the code look a bit better :)