Small code cleanup
Merge pull request #585 from Icenium/totev/future-any

Small code cleanup