pepified code a bit