Removed cut & paste refactoring + fixes with mixed file types