Minor changes to match other refactors
Added some temporary notes
Removed comment, added TODO