Minor cleanups and created a skeleton for requirement-parsing