Fix some indetations
Change indetation and improve bundle integration