Made code a bit nicer