Cleaning stuff up

No major changes