Cleaned and Fixed