Code cleanup

Much better now.