merging minor fixes to update code structure