Code cleanup

Some code spring cleaning.