Cleaned up parse.y