tidied up things a lil