Code cleanup and new content added