Added Penalty double
Cleaned up code