Made things look a bit nicer code wise