Add missing requires + better formatting