Tried to remove as many magic numbers as possible.

- This will make it easier to adjust positional values