Cleaning up scope