Condense input and cleanup#21

hgp297 wants to merge 10 commits intoOpenPBEE:mainOpenPBEE/Functional-Recovery-Python:mainfrom

hgp297:condense_inputhgp297/Functional-Recovery-Python:condense_inputCopy head branch name to clipboard