Code is clean now.