move bugfix, style improvements