Comments, code structure remake.