: cleanup and added a couple require