Code Cleaning & Spring Between Blocks