Updated best practices. Closes #1