changing some coding to match conventions, removing a log