Removed old functions, tidied up spacing