Clean the code according to comments