Fixed up lint errors
Finished up inlining content but something is going awry