Cleaned and fixed