Code cleaning is in progress