Use let and subject blocks for better readability