Tidy up - how have I not spotted this before