All changes cleaned up