Clean up + fix isJTPSLot method