Some cosmetic changes
small bugfix