Code clenaup