Updated Scripts to respect best practices