Improve organization and add cheat sheet