Cleanup

Some commits cleaning up some LOCs