Cleaning up + fixing todos