Some code refactoring, mostly changed variable names aswell for dragging down a bit on the CPU usage.