some indent fixed and removed empty lines