5th Commit, fixed even more Best Practices