Moving code-comments to where it should be implemented.