Simplified and tidied content up to it's basics