Some changes and cleanups
clean up