Cleaned up start and end parsing.