Cleanup, changed content to source