Added oUF tag to handle name and level
Slight style changes