Clean up trimmer module for readability