Making spacing size 4. Code cleanup.