code is clean now.