Fixed keywords and description  parsing bug. Code cleanup.