Some minor changes performed