Drop superfluous comments
Add additional handlers
Drop unused index for characters