Fixes and style changes after PR discussion