solved
Trying to make it more functional