fixed code arangment issue