Shift into correct namespace
Comment that I need to come back to
Remove unneeded white space