Small optimazitions

Remove logs
Single var pattern