Implemented comments by @cdeil and @eteq