Code cleanup

Mmm clean bananas.