refactor & rename listener & variables