Updating header comments
Code cleaning and reorg