ibid

cleaned up the working code a little bit