remove comments and reformatting code