Made the code look a bit nicer