Some code cleanup
Trala