Third commit, fixed best practices.