remove unnecessary comments
improve code organisation