Fixed some best practices related issues
fixed stuff