Minor tweaks and changes

Most changes are for consistency, unused code, and style