Code cleanup to prevent compiler warnings