fixed error, make file more compact