Cleanups & comments; added TODO for future reminders (or future programmers?)