cleaded up a little