Included improvements suggested through reviews