Minor code cleanup, reducing compiler warnings