fixed text; modify code layout