Finalized trimmer and fixed comments.