UserApp: doc cleansing and a few optimization