Code and comments cleanup was performed.