small style fixes & add pop model for testing