Removed missed, done TODO
Shortened lifetime of cast results / cleaner coding