pub update
Removed useless return value and small performance improvements