Cleaned up variable names in command handler