Improve subscribe flow and fix code review issues