Commit: Clean Code and update with new deisng