Made everything a bit cleaner and makde it clean up after itself