Improved comments
Improved header comment