code cleanup, less compiler warnings