clean-up commands updated for better readability