doing some code cleanup on IDE warnings