Tidying everything up
Realised i fucked erything up with the last update