Cleaned up parsing and added comments.