Did some minor cleanups and added some place-holders as reminders