[refactor] clean up code

[Leolainen]

Current codebase is very spaghetti. 🍝👌
Would be nice to have some order.