Cleanup, added more snippets todo