cleaned up block snippets a little