code cleanup, compiler warnings