Tidied up wp. Removed extension to make it easier to work with