Fix conventions n optimize shit n stuff