Code optimization

Code optimized, few changes today