Refactored to remove constants.h and nsPOP namespace