Code more orginazed.