Clean up compiler warnings using statements