Style updates as per issue tracker