Statement Cleanup a bit according to my practice