Updated the header comment
Inlined one-line functions