Various small cleanups

Some commits cleaning up some LOCs