Changed text, cleaned code