Cleaned and re-arranged