Clean up identifiers, use blocks for commands