Merge pull request #82 from domob1812/priority-calc

Some cleanup of the code.