Minor codecleaning