Removed a few magic numbers; our code has to be adaptable and explicit.