Minor enhancements in code
Useless stuff
Safety commit