Optimization

Code optimization and processes enhancement