slight change in ordering in the ifdef block to ensure better formatting after cleanup