Minor changes, don't affect the beaviour