cleaned up skrapper code a little bit