Cleaned and some changes