Cleanup, and started working on content loader