Header guards correction
Code cleanup
Code cleanup