More code cleanups (to test scrutinizer)