Added checking for white space before first ': '