removal of uneeded code and small changes here and there for easier scrolling