Updated and tided everything