Corrected using scope
Clean up comments and logs
Set default variable select width