Fixed include guards
Source code clean up and gardening