Organize code a bit better
2 files changed