Removed code duplication in 1p/2p files