Code cleanup
Doh