Some comments for refactoring and null pointer prevention.