Cleaned up prefix decrementing