Cleaned code more.