removed depricated method; cleared code a bit