Derivative fix: Comments and code style