various clean-ups through-out
cleaned up formatting