refactoring
better organized now

maybe
quick changes
quick