Code cleanup

This makes it smaller.