Minor edits
Refac, rename