Added optimizations
Get Value return ensurance and small touchup
Style Cleanup and redundant function removal.