Cleaned some mess