Clean up configuration
Simplify by using one liners instead of blocks