Organized some ids
Some tidying