Minor tweaks to clean up ode
[NEW LIFE] A whole bunch of changes to make everything cleaner