Spring Clean Up

State: ID