Improve staging hunk

This is related to #63