Removed additional spaces, faster parsing