Updated byline and cleaned code