Minor changes but working a lot nicer now :)