clenaed up more code