Remove extraneous declarations, cleanup, minor tweaks