moved refactor changes back into original file
reformatted lineage, removed dead imports, cleaned out redundant comment blocks