update: cleaning the code