Now the core should look a bit cleaner :)