more code cleanning