refactor(all modules):clean up code
Clean up code for better readability with groovy DSL support