Added user helper and tidied up some files