refactored some stuff
okay forgot to add that