(partly) cleaned up organization