Cleaning / minor changes