changes and cleaned a little