Organize, cleanup and update