Code cleanup (indentation)
Code cleanup header files needed to use this library