Style change and bugfix