Some style tweaks, courtesy of @luqmaan