Cleaned code some more