Code cleaning in progress..