Fixed and cleaned