Tidied offset code snippets further.