Let's tidy up a bit + more sheeeel!