Cleanup, fixed parse assumptions