deleted empty spaces & fixed structure