Code cleanup, syncing up