Cleaned my org setup (and commented some stuff).