Trim comments
Remove unused mixin params
Blank line :cop: