Cleaned stuff up and correct punch.