Cleaned up some low hanging fruit