Cleanup

More clean up for consistency and typos.