pepified code
code cleanup after review.