abit more refactors
refactor
refactor
did some refactorings