Sam lint mess

Clean up some lint mostly left by @SmithSamuelM