Code cleaning, standardizing interface