Code formatting

I have gone through all the code of the bundle and applied code formatting as it is not consistent (check code source via github ui).