Cleaned the whole mess up