remove comments
clear up and renamen