Further conform to best practices