Tweaking the values
Formatted more code nicely
Master push