Clean up and better modules