* Minor cleaning and bugfix