Cleaned code more