Much cleaner code snippets