Improve implementation section