Clean access to IDs
Block code cleanup