Code clenaup.