Optimization
Also added config.yml for easy config changing