[ADMIN] refactored syntax and minor improvements